Added unique constraint support