HSEARCH-1365 Refactoring ServiceManager and service contract