Further changes to ensure JSON matches the model expected by the validator