Add thunk resolving functionality