added support for tagging functions