Improve user context chapter