Added Tagging mechanism