Added modeshape info into EDS and DV