#COP-163 initial. Support new with delegates