Added NFE and PU