Altered the "needEntityContext".