Refactoring map handler