Added support for non col key defs.