Add support for thunks