Change users to be object and add room property