Some more changes on model classes
Merge