Fix metamodel, base pointers
Refactor
Regression test for AdmImporter