Updated to support the new initial room functionality