Updated the modelclasses