Add the DeviceInfoSet class and instance factory methods