Refactor of maps