Updated archive functions