Improved history and context info