UPC-38 Add support for archived versions