Readd multi device support, only one session per device is used