Adding find support