Updated archiving to archive shredded as well as enriched