Refactoring of Builder Domain code