Changes to preserve hot plug script