Added support for ED (first part)