Added basic tagging support.