Reworked Types class.. again.. need to fix corresponding code in ColumnDef code to match.