Better MACRO wrapper