Add support for $service-room$