Added OTG support