simplify session support