Refactored builde