Added macros.