using model set in main app, move extra data from mapping files to extra
data files (must now be part of data graph)