More info on classes, guidelines update