Changes to the user module and other modules