Modify for integrating ADB helper extension