Adding deviceId