[tvp] Modernize