Change structure for composer