Improved Build Process