Added macros support