Aggregate v1 modifications