Improving import-feature.