More thread-safety for Rooms collection (still not very good one)