Builder refactor