adding syntax macro support