changes to FileImporter and FileReader