Better build process