Adapt the code to core changes
The code in core is changing for management refactor from fd#5135
The code in the plugins needs to be adapted accordingly.
The code in core is changing for management refactor from fd#5135
The code in the plugins needs to be adapted accordingly.