Add thunk detection