Removed some methods from readerwriter, moved to files