Added macros, multiple files