Migrates storage to std::map