Added more indexed types.