Added new features to the tagging system