Adding plugin RPC support