Moved the data type definitions to the column header file.