Expand REST and RPC