Add Hotplug Support