Added archiving to the Application Model