Added support for unique constraints