Renamed Holder to Containing and Aggregation to Aggregating.