Refactored data mapping classes to implementations of IStorageContext to allow being used with dependency injection