Replaced more macros