Some more Dto cleanup / consolidation