Adding more aggregation/embedding for Visitor pattern