KVP Daemon changes