Added tf support for tags