Added new classes to the model