Added session saving