Add composite entity pattern