Add macro support
Replace the macro so that the code will pass the pig compiler