Updates to build process