Improve hotplugging support.