Defined more classes