Update use of copying and archiving functions