Added several extra classes