Documentation work. Refactoring responses.

Change-Id: I2efacbc1bb4069d2a007d4b6d7812e274cd15efb