Remember the thing type, the workflow is improved :)