Added refactored finder