Various changes to DTO and GW
various changes to DTO and GW