Adding support for empty column group