Added new mappings to DTO
Added new properties to DTO
Changed comments to notes.