Added missing column types and replaced all types with type constants