Improve column handling