Updating to latest schema from main nml2 repo