Changed aggregation to composition and something else to composition