adding RPNI and RPNI_MM from AIDE