Archiving 2.0 support