Use PreProcessedColumn Structs and String Instead of Enum

Use PreProcessedColumn Structs and String Instead of Enum #8358