Better sessions support