Macro definitions updated