Tune DTOs. Closes #18 

Relates to #18