Added archiving functionality