Update model classes

chris