Initial work on hotplug support.