Add composition class