Update with new USB API