Reorder and update composer