Add macro support