Updates to YARN macros