Use non-depreacated components. Tidy up after plugin-manger refactoring.