made ServiceClientManager generic again