Added support for heat map