Added basic tagging functionality