Add tagging capabilities