Add new version of macros for RSN analysis