Added some more modification to the model classes