Fix composer structure