ISSUE-22 handle unique fields, changed the scope of unique fields to a class