Switch to composition methodology