Modify codes because of upgraded redundant-manager