Added unique support