PATH parse logic added