fix services, merging to one Service Interface