Make Hotplug More Responsive