Rework build process