Updated handling io