Improved find method