Added support for uniqueness