-added getter for deviceId in DeviceId.cs