#79: Improve structure of validated and non validated IO.