Now properly supports uniques