Added basic RPC support