New build and build tool modifications