Tried to normalize context usage