Some changes to the new JsonSchemaFactory