Refactored Build