Refactor changing map items