Added unique constraints to fields