Badge tags

This adds support for badge tags.