Added a few new macros, especially context macros