Added UNIQUE support