+ refactored RemoteCallInterceptor