use common model, EF upgrade