Added more macros