Refactored build management