Added findFolder functionality