Updated for BuildMaster 4.5