Update to add labeling of oc-gen:classes