FIX unique constraint
Add check for unique