Improved context data one again