Add new futures and some fixes