Updated code with BIMserver changes