Extension: smarter set of options for session