Build refactoring