Add more flexibility for find method #4