Added hotspot tracking