Added lots of import_data functionality