Moved things out of composition class