Add tagging ability