Added find and find_index