[Nml-wg] Schema changes