Add context to avoid unnecessary renders; CR: EF