Further work on rpc helper