Updated Archive service from some discrepancies detected during prototyping.