Added support for tagging