added support for tags