Add support for context-specific ordering
Add session and multiple user support