Updated delegate calls