Updated build process