Updated to latest nif.xml commit