Add better column header sniffer