Added path searching