Issue #509 - add session data