Added macros from cnda