Changed some fields

Change-Id: Ib8c4d50072ae497fe532992e37e4e025ceb699a7