Uniq field added, some fixes