Work on build process