Refactor maps module
Refactor maps module