Upgrade to remote macros