Build refactor