Updated KVP Daemon Code