Simpler session handling