Updated for BuildMaster 4.0
Formatting
Compatibility fix