Refactored ArchiveType