Added path lookup