Refactoring of Map