Merge archive extraction into parsing