Added a new User module
More changes