Build refactored