Updating to latest NML2 schema & regenerated nml.py