First commit for envelope aggregation