Updated parser

Takes all columns