Reverted use of heatmapDto's data