Updated to work with latest BIMserver code