Edited KVClient and handler and idnented message