AIRIOS-58 Fixed loading of the core data model