added support for unique field indexing