Update to new macros