Added partial support for the textual tags