Updated and fixed IO-classes