Unique keys are now working