Use new endpoint to avoid multiples request for validation data

Use new endpoint to avoid multiples request for validation data #1434