Updated macros with macros needed for launcher.