Updated for BuildMaster 4.0