adjustments to data model for new munki2 keys
adjusted data model