new yaml format

Change-Id: Iee3b187b1c13519f047b75a58afaf05dfe076a3b