Adding better path detectors

Change-Id: I6e11caee1de39548db777e3c55eb1edd9b251eda