Model Importer rewrite