Change some RPC calls for new data model.