Changes in code to aid the new build script