Add roomservice support