Improvement: Several small improvements in the archive function