Added basic support for columns.