Improve import script, regenerate schema.rb