Feature/add search paths

Feature/add search paths