Added remaining importer code