Added tagging capabilities.