Class Guideline updates