Refactor builders