Reorganized build stage