Improved hotspots class