Added AFEDRI-USB specific support