Change to RPC interface