pattern: update the loader to match the new datamodel.