Added remaining classes