Add support for newly-required room_id