Updated UserManager