Added some macros.