#228 align management with recent changes.