Reorganize and add futures