Added some refinement in RNDT export