Replacing a map in SubclassCertification with proper category data