Better future handling