Improved user info model
Merge branch 'develop'