Add support for multiple concurrent sessions