Updated user part of the CLI and UserManager