Refactored the default service implementation