Updated find method