Added support for UNIQUE columns