Added support for TNS strings