Updating some macros