Added local index generator