Improve support for column-size