Added EntityModel to Solution