Added more fields

Change-Id: I8e12520f444a7e9372fba8e402f4e4592f0ac791