statefull session improvements