Some more plugin wiring