Added Design patterns, fixed one aggregation