Improve support for anonymous sessions