Added def macros