Map is changed to list