Change EntityModel
Pull
Fix model
Merge EntityModel