Add parsing of tag and text