improve class importer