Modified scripts for importing