Refactor Service to Builder.
Refactor Builder.