Update to latest build process