Improved Macro collection