Added EDD functionality