Fixed EntityModel decl