Moved unwrap callbacks out of future