add context to all thunk