Major rework of KV core