Add more to users model
Merge conflicts