Updated all code to IFC4 implementation