Added some labels to classes