Add tagging functionality