Add RNS support