Add archiving support