Re-add kwpsUniquenessTypes