Updating to latest nml2 schema from main nml repo