Improve Delegate management interface

DLTP-303