Support latest redundant-manager and refactor