adjustments for new archive implementation