Update use of Future for latest changes