Added full support for multi-sessions