Replaced old Match class with former HeatMap class