Added support for spring session