Added some classes