Improved hotspot options