added support for tag generation