#40 Metamodel finally migrated to PersistentXXX types!