Improve archiver