Changed structure for composer