Enhancements to import script to make it more capable of picking up in the middle of an import