Simplification
Simplifying store
Bug fix
Bug fix
Bug fix
Tweaks
Simplifications
Bug fix
Revert
Simplifications
Tweaks
Bug fix for class hierarchy of cids
Tests passing
Simplification