Added support for column collation