Aggregation and ML plugin improvements