Updated for BuildMaster 4.4