Added tagging ability