Finished DI for plugins