schema importer improvements