Adding support for multiple columns.