Improved nml parser support