Added Hotspots handler