Added delegate factory