Modifying room -> client connection implementation