rework keys for inheritence
refactor store