Added in many column types for #8