RPC Daemon changes