Modified tagging to not use a multimethod