Should we also add directives to deal with 'r' and 'g' tags as well?