Update X-DELEGATE mechanism