Refactor futures into future executions and future results. Also separate future registry