Support for heatmap added