Expand manual

Change-Id: I055a8a507b9879da43f31b68620e7f3a39455ab5