Merge "Rework the Model Json"