Refactoring, add find-method