Key value store APIs rework