Modified the service interface