Added more macros;