Added macros for cleaner path creation