Tune DTOs. Relates to #18