Updated RDF output and added ESD RDF