Added some attributes to classes