Convert columns more intelligently