Nhif additions
Further nhif changes