More refactions to future_data, yet even more fixes