Client:rooms improved