Build process refactored