Added some macros for basic generator creation