Add USB support part #2