Better session data support.