Updated and extended macros