Refactor service interface