Moved token requirement into a separate plug