edge.aggregator: Addressed review comments