added some rudimentary tagging support