refactored to use new rpc service refactoring