Updated for all class checks