Implemented tagging functionality