Edata reading reworked