Macros moved into external repo