Added choropleth functionality