Refactoring mapManager services