Mapper now uses IStorage
Moved everything to IStorage and it's still working