add more macros