Added the user model
Merged from diff machines