Refactored find() method