Added extra check classes