More refactions to future_data, fix