Added multiline macro support