Added client hash, client salt to data model
Merge