Added new archiving implementation