adding remaining classes