Moving from inheritance to composition