Convert to use EffectiveModelContext