Updated with new DeviceType metadata