Added basic path searching