Added support for a new EDD format, as well as support for the EDD being defined...