Multiple devices per session support is added