Added column type definition.
Merge branch 'types'