Complete (?) move to TSV extractors