Change map and list because of change in eve