Aggregate a little more adaptable