Added some tagging features