Edit calls to room class in util function