updated Model class