Add support for multiple rooms