Refactoring the store type classes