MCP Aggregation - improvements