Updated for BuildMaster 4.2