Changed naming and aggregation