Builder refactoring.