added support for session - not implemented yet