Added some useful macros