- Add macro support