Class identifiers, updated with yoda statements