Added more archive functionality