Small update for context lookup