Removed CommaSeparatedText and instead using Text for all text-values.