MoA import, changes to the data model