Final changes to User module.