BUG-7464: Refactor KVNode