Add support for 'rooms'