Add array checking to ColumnDefinition
Rebased