changed DTO structure

Change-Id: I7c4c7caa72fa13bcbc4fc5a092b9d4b76c29650b