update to json strucure and parsing