Management topic reworked