Updating to reflect latest changes to build tool