Move 'composition' to 'model'.