refactored finder classes -> reduced number of necessary methods