Entity: Inheritance changed to composition