Edata Header handling changed to struct style