Service interface added and refactored