adding tagging support

works for my test case
should not interfere with any current usage