Added hotplug support