Map refactoring step1