Added tagging support.