Update User model to support latest Ncip client