Updated all importing routines

Tests successful