Reorganize and add data