Refactor Mapper
Refactor
A lot for refactoring
Use common base store