add ip_user_type and remove deprecated fields