Moved macros into a separate file