More refactions to future_data, even more fixes