Added in the tagging feature.