Add macro section headers and new macros