Add support for RPC calls