Added basic tagging feature