Fleshed out RPC api a bit more