ISSUE-22 handle unique fields
ISSUE-22 handle unique fields, changed the scope of unique fields to a class
Merge remote-tracking branch 'nikita2206/master'
Update branch-alias