Add unique constraints to HVT/HVD entries