Modified user data models
Merge remote-tracking branch 'origin/master'
Modified user data models