Port over updated macros