Add more on macros