Added macro support