added support for tagging