Switched to using ArchiveAdaptor