Added extra classes