Adjust to io changes