Completed the Archive functionality