Macro improvements