Add block macros for each support diagram format