Add rns comment support