update model classes to meet the schema
merge