Changed models properties

 - Changed all properties according to classes.pdf