introduced session context for future extension