Added Macros