Adding RPC service and notification support