map db storage moved to satellite
Refactoring