Support v2 for heatmap