Include service-id and device-id here as well