Update delegation CLI based on Gerd's feedback