Make session optional.