Added LocationFinder interface