Update I/O to use updated functions