Added some grammmar for macros.