Started with implementing switch to use sessions or not