Added some macros