Started to add subclass KV

v
Revert "Started to add subclass KV"

This reverts commit 739f49d94aa362ce3a9783badc63cf31381a542f.
Revert "Revert "Started to add subclass KV""

This reverts commit 529c1fb91161422e669fea85a2c021c636050f32.