Added basic tagging capability