Minor modifications for delegation setup