Add uniqueness requirements to clusters