Added some unique index support.