Added macros