add multi-room support