Adjust to CodeGenerator using EffectiveModelContext