Added support for heatmaps