Further identity work, use unique_constraint_name instead of primary_columns