Changes for PATH injection and better reporting
PATH injection changes