Added delegatees to support latest developments