Improve TPI handling