Improved Generator macros