Expanding TXT support