Add former macros