Add more macros