Update with conservative column parsing changes