Pick up change to support UNIQUE column constraints