Add SimpleFinder class