Update for new NF processing