Refs #15669; Updated mapping for new fields