Fix Iterator. Add additiional 'TextIn' classes