Added a lot of chages for users