Bit more work on getting the JSON schema sorted.