Update to implement changes to IOHandler interface and return only remaining data, if any