Updating to the latest nml2 schema & regenerated