Update the macros