Updates compatible with BiMServer rev 2335