Updating calls to plugman after a refactoring there