Add support for multiple sessions