Simplify session state