Adding features for aggregate usages