Added user model
Improved user model