Updates for using categorical data in the map.