Better handling of columns