Improved client side archiving