Added tipp-esq cols to mapping