added support for more tags