Improving generic strategy and Capacitor.