Management: Align with the new API (Stream)