More refactions to future_data, more fixes