Added more to classes