- added support for tags and dynamic contents