Upgrade to E2 API with disconnect-all method