Update to D2, update JSON schema