Reverted a change in dataclient and changes to Ioclient