Adding tagging functionality after this commit