Used generic names for the json structure definition
Heatmap widget few changes