Implemented the tagging feature