Use a separate function to process the new json to increase the readability of the code. Change-Id: If508563fd9ccb2a6b0edb40a3cfe2a0081cb97f4