Fixed edm:incorporates generation