Added some properties to classes