Refactored Service API.