more import_class refactoring