More work on the service facade.
Refactored redundant code.