Add fallback for macros