Adding more classes/modifications to model