Updated to the latest JSON schema