Use DTOs and comments.

Change-Id: If9261d891bbc2789c2875bf341e643039ffc7649